Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <[email protected]>
Sat, 27 Mar 2010 23:11:16 +0000 (00:11 +0100)
committerWolfgang Denk <[email protected]>
Sat, 27 Mar 2010 23:11:16 +0000 (00:11 +0100)

Trivial merge